2014 updates
Merge branch 'master' of https://github.com/vsilent/smarty-bot