Nathan Ho Merge pull request #7 from cianoc/master