Multiple edits from Luke across several files
Merge pull request #10 from liamwaugh/branch_LW_20140316

Multiple edits from Luke across several files