Merge next
into master
#76
+16
−12
Merged
next
into master
#76