Fixes #25 - release candidate