merge pull
v2
Merge pull request #7 from Oopz/master