Merge projects and code to fix #8