ams-ICT/Year-7 — pull request #7 by ams-bjones (2014-03-01 10:33:58+00:00)
Title: More up to date pull request

Addresses issues #3, #4, and #5, and updates on pull request #6