missing files
small bugfixes
Merge pull request #98 from slew/master

missing files