Update cpsr.lock
Update tags
Fix tests
Merge pull request #22 from nlegoff/patch-4.0

Patch for version 0.4.0