Merge pull request #68 from creativedutchmen/development

Merging development