Issue 42 completed
Merge branch 'master' of https://github.com/tanpd/EPS