Synchronize with 1.7; fix entity saving (#7)
Maybe fix #6
Merge 1.6