NoTask - Some more work
Merge pull request #8 from JackMarshallHD/23092013

Adding work completed on the 23rd