GH426 - rebase

#426 
in spec => Rebase...