Merge pull request #26 from UsabilityDynamics/development

Standard merge.
Merge pull request #27 from UsabilityDynamics/master

Merge pull request #26 from UsabilityDynamics/development