Merge pull request #2 from UsabilityDynamics/master

Merging [ci skip]