Merge pull request #181 from adamralph/51-various

51 various
wip