Implemented #15 & #16