Hot Fixes
Merge pull request #22 from theponti/develop

Hot Fixes