Merge latest updates for production deploy #42

Closed mtheoryx closed 5 years ago