merge dev to master

#851