several minor fixes
Merge pull request #35 from UsabilityDynamics/2.0.0

several minor fixes