commiting the stuff from om1
Merge pull request #1 from jamiecurle/master

commiting the stuff from om1