merged code with Mac Branch
Merge branch 'master' of github.com:avpreserve/fixity