dev into master #25

Closed mcollera closed 6 years ago