GH426 - rebase

#426 
why?