Merge pull request #25 from Matoking/master