resolution merge
Merge pull request #12 from blabla45/master

resolution merge