Issues #24 & #29