Merge branch 'issue/#15' + bump version to v1.3.0