Combine the swift user definition

Kill the clone warning and combine the swift user definition.
Merge pull request #40 from claco/master

Merged automatically by jenkins after successful build test