Explicitly comparing optionals with nil due to language changes in Xcode 6 beta 5
Merge pull request #237 from iv-mexx/master

[FIX] Explicitly comparing optionals with nil due to swift changes in beta 5. (Markus Chmelar)