simplified code
updated version
Merge pull request #2 from stephenheard/development

Development