work16122014
Merge pull request #7 from andrewknowles/work16122014

work16122014