Merge pull request #1 from pensivearchitect/master

Am bad at markdown
Merge branch 'master' into develop