Closes #46 (closed)
added 2 commits
Compare with previous version
unmarked as a Work In Progress
mentioned in commit 9c160ad9
merged