Tried to fix library merge.
Merge branch 'master' of https://github.com/scdickson/WordScan