Merge changes from martyn into master

NEWuser authored
revision ee31acc1302a30604eeea20f548745c1ae50fda7
document
### Welcome to your project!

- Brush up on Markdown: http://daringfireball.net/projects/markdown/basics
- Learn about Penflip: [penflip.com/help](http://www.penflip.com/help)
- Talk to a person: support@penflip.com

some changes here