Merge pull request #25 from cdcharlebois/development

Swipe it real good!