Merge pull request #1 from paian/dev

dev branch
Merge pull request #2 from paian/dev

Dev
index page
Merge pull request #3 from paian/index

Index