Bringing Bagnon updates.
Also fixes issues #66, #57 and #55.