(#35) Feature/35 mass updates merged to develop #39

Closed thavythach closed 8 years ago