Last changes, ready for pull request