Swift 1.1 compatible
Merge pull request #1 from gfx/swift_1_1

Swift 1.1 compatible