Fix #333
Merge branch 'origin/dev'