Merged Issue-18 from rwblackburn