Fix/issue 84

Fixes issue #84 (sorry for the poor naming of the branch, you may want to refer to the right issue in the commit)