changes made to accomodate pull request 9 from jguinney