Ben's update
Merge branch 'master' of https://github.com/benschultz/Framework
Another comment after unit description