fixed a couple of bugs
Merge pull request #17 from maiahariton/master

fixed a couple of bugs