comments updated
Beta Version
Merge branch 'master' into version/bj-timber
Merge pull request #13 from shawnsandy/version/bj-timber

Version/bj timber