Merge pull request #27 from ctismer/master

working on small enhancements