Messing stuff up on the test branch
Undone deletions and added better comments.
Merge pull request #1 from dukky/test-branch

Test merge..