Release 0.4.0

Closed Jun 9, 2018 100% complete