Remove trailing whitespace
Merge pull request #295 from yous/trailing-whitespace

Remove trailing whitespace
Merge remote-tracking branch 'upstream/master'
Sorted link error at runtime for **