various fix

anto-mcfly requested to merge develop into master Feb 12, 2019