Update 03/05/2014

Stuff
Merge pull request #1 from jawittdesigns/development

Update 03/05/2014