Closes #9
Merge branch 'devel'