minor fix
Merge branch 'issue-12' into develop