Merge pull request #1 from FlamingCode/master

Merge tested setup
Merge remote-tracking branch 'origin/0.x'