Fixes issue #30
Fixes issue #27
Merge branch 'origin/dev'