Merge pull request #43 from onovotny/master

Code cleanup