Work in progress.
Merge pull request #2 from gjb2048/master

Work in progress.