GH426 - rebase

#426