Changed lock structure back to previous version (looks like we reverted it by mistake).
Merge branch 'master' of github.com:wilseypa/pdes