Merge pull request #26 from TheOneRing/master