Changes for version 0.1