sync with the code

replaces #19