bug fixes
Merge pull request #4 from danasf/master

bug fixes