Merge pull request #1 from tavaron/master