Merge pull request #1 from SageMantis/master

update from scott