Merge pull request #4 from kamrik/master