Please merge me
Merge 2
Merge pull request #7 from Soleone/pull-request-1

Merge 2