fix #51
Merge branch 'dev' of https://github.com/i-score/i-score into dev