Merge pull request #1 from schue/master

James' changes