Update 03/07/2014

- major update
Merge pull request #5 from jawittdesigns/development

Update 03/07/2014