Merge pull request #3 from arago/master

pull
Merge pull request #19 from mglusiuk/master

update
change permlink handling
Merge pull request #34 from viteke/master

improve site navigation