Merge pull request #1 from UsabilityDynamics/master

Routine
Merge pull request #2 from UsabilityDynamics/develop

Merge pull request #1 from UsabilityDynamics/master