Merge pull request #53 from DamirSvrtan/development

Merging to the _development_ branch.
Changes around new release.
Merge remote branch 'upstream/development' into development