hdoria Merge pull request #15 from coreb1t/master