Fixed Issues #11,12,13