Abhi rebase

issue #165