Corrected issue #18

Also incremented the version.