Develop

Initial stable version from develop.