Bug fix for version 0.1.3