v1.0a, fixes issue #2