Merge branch 'hotfix/1.2.3'
Merge branch 'develop'
Fixed the indentation (see #26)
Release 2.0.1 stable
Merge branch 'hotfix/2.0.1' into develop