ADD: locking. also another unit test.
MERGE: Merge branch 'master' of github.com:izzycecil/Paratype