Update to latest development (#23)