Implementation of Issues #66 #137 #145