various
Merge pull request #13 from andrewknowles/work31102014

various