Merge pull request #46 from chrylis/master

minor cleanups to remove warnings