Revised final bullet but eventually commented it out.
Merge conflicts
fixes #13 resolves #12 and fixes #6
Merge pull request #15 from thebruce/dev

Dev