Merge pull request #22 from freeman1988/master

looks good