Issue #151 - review changes and fix obvious mistakes
Issue #151 - comment regarding efficiency