merge dev to master

#167