Fixed last part of Issue #141
Merge branch 'master' of https://github.com/SeasoningDev/Seasoning.git