march 21
second patch for swift
Merged annashen's Swift changes into master branch.