Merge pull request #1 from darkzero/master

Start up