Removing unrelated changes introduced in #16 , and creating patch that has bo...