credit dmeulen as an author
Merge branch 'master' into develop
version 1.2.0