Merge pull request #6 from UsabilityDynamics/master

Upstream
Merge pull request #7 from UsabilityDynamics/develop

Merge pull request #6 from UsabilityDynamics/master