Corrected #118
Merge branch 'master' into dev