#29: bugfixes for version 0.3.1