Harrys feature done
One line added
make some super-stable changes to master
Harrys feature merget to master version