Merge pull request #10 from jackstah/master