merger
Merge pull request #1 from definetux/master

merger