Closes #27
Merge branch 'master' into data-import