Merge pull request #1 from ChrisMacNaughton/master

master is the other block