resolved merge conflict
Merge pull request #5 from uwetews/master

resolved merge conflict