first final version
Merge pull request #1 from MartinB83/pagev2

first final version