fixed bugs 7 & 8
Merge pull request #17 from hege0110/master

fixed bugs 7 & 8