Fixes #11 issue.
Merge branch 'master' into develop