merge dev to master

#876