Merge pull request #56 from nweber/development

Development