Closes #20
Merge branch 'issue20' into devel
Merge branch 'devel'