merge dev to master

#22