First commit
Merge branch 'master' of https://github.com/cpesyna/eras_proj