Merge pull request #1 from Apocrathia/master

Development branch initialization