fixed bug
Merge pull request #152 from dennisd7/merge-test2

fixed bugsssss now its really working! :DDDD