Fix for #54
Merge branch 'master' into 2.0