Tests all pass for locks
Merge pull request #5 from johnshiver/locks

Tests all pass for locks