Merge pull request #13 from liamwaugh/branch_LW_20140316

Branch lw 20140316