Bugfix13

A proposal to fix issue #13.