fixed errors caused by Swift b4
Merge branch 'master' of https://github.com/ndavidsson/NDHpple