Fix #42 FC when clicking Links
Merge pull request #56 from BigBoot/master

Fix #42 FC when clicking Links
Merge remote-tracking branch 'origin/master' into api-21-changes