Fix #14 label for
Close #14 Merge branch 'develop'