Merge pull request #6 from UsabilityDynamics/master

Upstream