Refactoring of header and new requirements.
Merge branch 'master' of github.com:orby/hackaton