test
Merge pull request #4 from peterbenoit/master

pull request 1