Merge pull request #1 from SageMantis/master

update from scott
Merge pull request #67 from mierze/master

Merge pull request #1 from SageMantis/master