changes
Merge pull request #13 from kviksilver/fixes

changes