Merge pull request #35 from brianjmiller/master

Concurrency Fixes
Merge pull request #36 from brianjmiller/master

Fix concurrency header issue for state