update from development to 0.4