Merge pull request #26 from Astranox/master