Fixed merge
Merge branch 'master' of https://github.com/wyllys66/swift3