I created this PR since the current devel branch isn't working as expected (reported here #94 (closed)).