fixed #14
Merge branch 'dev'