Merge pull request #2 from imreg/development

Merge Development into Release