Merge pull request #9 from KB50-G1/develop

Lots of stupid changes to the master (production) branch