Refactoring.
Introducing basic web page.
Little fix
Merge remote-tracking branch 'origin/master'