minor fix
solved conflict
Merge pull request #3 from wickens/benson

Benson