Merge pull request #1 from jjrocks/master

Testing out online pmerging.