fixed bugs
Merge pull request #6 from carand/master

fixed bugs