Merge pull request #2 from kpot86/master

test