Bug fix for release 0.1