Merge pull request #42 from ApocalypseCoreteam/master

Update branch