Fixes all bugs reported up to Jul.30/2014
Fixes bugs up to Jul.30/2014