Updated analysis functionality to be more efficient
Merge branch 'master' of github.com:gsheld/rwb