Documented the code a little.
Merge branch 'develop'