520

Fixes issue #1
Merge branch 'configurable'