Issues #325 #331 Implemented