Issues #131, #129, #126 & Hotfixes & Beautification Stuff

Issues #131, #129, #126 & Hotfixes & Beautification Stuff
Merge pull request #138 from fgiannar/develop

Issues #131, #129, #126 & Hotfixes & Beautification Stuff