closes #19
Merge branch 'enhancement/19'