Committing Peter's code he left on the server.
Merge branch 'peter_feb13'