Fixes #26 - minor improvements