Incorporates changes suggested by Roger Quinn.
Merge branch 'master' of github.com:evenator/masters