pre-merge
Merge branch 'master' of https://github.com/th0ran/richard_ii into router
added 140 characters alert