Ready to be delivered

Hopefully no unknown bugs occur
Merge branch 'master' of https://github.com/slindel/OOSE