resolved conflicts associated with pull request 9 from jguinney