Merge pull request #2 from UsabilityDynamics/master

Merging [ci skip]
Merge pull request #4 from UsabilityDynamics/develop

Merge pull request #2 from UsabilityDynamics/master