Merge pull request #104 from ningosi/master

Minor changes
Cleanup and fixes after merge from @ningosi