bug fixes on 4 july 2014

bug fixes on 4 july 2014 by external resource