Fixes warning about incompatible types in Xcode 6
Fixes warning about NSCopying in Xcode 6
Merge pull request #40 from mkj-is/master

Fixes two Xcode 6 warnings