Fixes issue #45
Merge remote branch 'origin/master'