Rebasing ..the change for issue #31 ... correcting indendations show that the changes are distinct