Fix bug
Merge branch 'stable' of github.com:yklee1013/linking into stable
Potentially done