Merge pull request #3 from KevinVitale/development

Merge 'development' into 'master'
Whatever, Xcode...