merge dev to master

#104