fixes those bugs
fixes those bugs for real this time
Merge pull request #4 from waneka/bugfix

fixes those bugs