Merge pull request #4 from thisMagpie/master

Merge Development with Master