merged pull request for version 2 from Steve Robinson...thank you steve