Merge pull request #6 from monts89/master

test