Commit so I can merge
Merge branch 'master' of https://github.com/mptrsen/HaMStRad
Bug fixes.