Some more changes before tag Version 0.9.6