Merge pull request #4 from bonekill/master

test