Merge pull request from UsabilityDynamics/development