Fixes issue #4
Merge remote-tracking branch 'origin/dev'