Merge pull request #8 from LiquidVoid/develop

Lots of Fixes
Merge branch 'master' of https://github.com/LiquidVoid/macros into develop