Fixed #37
Merge branch 'master' into dev