merge master changes #3

Closed luckypickle closed 6 years ago