merge changes from the 0.1 preparatio branch