Merge pull request #1370 from mirage/master

+crunch.1.1.1
+crunch.1.1.2