Rebase my changes on top of master.

#137 / #134