updated some class-names to retain compatibility with OC5
Revert space intention to tab intention
Merge pull request #2 from psych0d0g/master

OC5 compatibility