Version 1.0.3
Merge branch 'develop' into 'master'
Version 1.1
Started 1.2