Merge dev to master

#11