Merge pull request #20 from nelsonblaha/master

bugfixes