Develop new commits

I have done some changes to the develop branch, I think it would be good for you to take the latest version as basis for further development.