Merge pull request #24 from Negusbuk/master

misc. fixes and cleanups