Development Changes

This Pull Request will last opened for continuous checking (Travis CI) of my local changes ...