fixed #44
Merge branch 'feature/error-shift-link-click' into develop

* feature/error-shift-link-click:
  fixed #44