fix #74 #77 #78 #80 by insight.sensiolabs.com