bug fixes
Merge pull request #43 from nemrow/testing

bug fixes