Some changes
Merge branch 'master' of https://github.com/Flur/flur.github.com