Final commit, ready for tagging
I know what I am doing. Trust me.