Merge pull request #1 from unl/master

Merge upsream master