Merge pull request #15 from jackstah/master