Merge pull request #8 from jackstah/master