Merge pull request #1 from darkzero/master

Start up
Merge pull request #2 from darkzero/develop

Merge pull request #1 from darkzero/master