one more change.
Merge branch 'daily/1.0.0' of https://github.com/fakegeek/Project-Boone into daily/1.0.0