2.1.0

Closed Jan 11, 2017 100% complete