Fix issue #16

New release version