Version 5.0.2

Closed Jan 9, 2018 100% complete