Merge pull request #58 from senkin/master

Cleaning up a bit