Merge pull request #24 from Kronuz/master