Merge pull request #2 from Gildorym/master