Merge pull request #26 from UsabilityDynamics/development

Standard merge.