hot fixes
Merge pull request #64 from sharpdigital/feature/hot_fixes

hot fixes