Using rebase to fix branch source

Using

rebase

to fix branch source

rebase

#028

@jtemporal