merge changes from dev #3

Closed joeaudette closed 7 years ago