Prepare bugfix iteration towards 0.1.8