Merge documents branch, fix #13