issue fixes 29 may 2014 5.30

issue fixes 29 may 2014 5.30