Now on version 1.5
Merge branch 'develop'