Upgrade Zuckrig to 0.1.1 #65
Merge branch '65_Zuckrig'