Bug fix release

This is for a bug fix release to address issue #25