Merge pull request #123 from greboid/master

{@link not @{link
Fix compiler warnings I added.