chrisdone Merge pull request #34 from cloudier/patch-1