bug fixes
Merge pull request #2 from danasf/master

bug fixes