Update to latest development (#26)