bugfixes
Merge pull request #6 from Bixie/fixes

bugfixes