Fixes #27 - release candidate