GH426 - rebase

#426 

use GH426 - rebase branch to make changes.