#298 - More review updates
Merge branch 'fluo-298' of github.com:mikewalch/fluo into fluo-298