Merge pull request #239 from tkremenek/upgrade-swift5

Upgrade code to be able to build with Swift 5.