CANADA!

- bug fix on following
- added @user support