updating forked repo (july 2014)