Source updated
Merge branch 'dev' of github.com:kud/blog into dev