Merge pull request #13 from liamwaugh/branch_LW_20140316

Branch lw 20140316
Merge pull request #16 from TeamProject1014/branch_LW_20140316

Merge pull request #13 from liamwaugh/branch_LW_20140316