Commented and re-arranged code
Merge branch 'master' of https://github.com/jeche/OPS