Update to latest(May8, 2014) master fork