Fixed all bugs! 7-9
Merge pull request #13 from pgrody/master

Fixed all bugs! 7-9