Merge pull request #24 from gtrak/master

Bug fixes