hamish-milne Merge pull request #11 from PaulTamayoS/patch-1