Merge with Meyang's code for insert
Merge branch 'master' of https://github.com/whuwb/Swift