Merge pull request #1 from Greenlock/develop

Develop
Merge pull request #2 from DiamondSwordDev/develop

Merge in code from develop
Merge pull request #3 from Greenlock/master

Pull to main repo for 0.0.4-Alpha
Merge pull request #3 from DiamondSwordDev/master

Merge fork to main repo