update

commits merged, is it OK now?