merge dev to master

#4