Minor Fixes
Merge branch 'master' of https://github.com/TTia/xblog-thesis
Last Fixes