work17122014
Merge pull request #9 from andrewknowles/work17122014

work17122014