Merge remote-tracking branch 'origin/eb_dev'
added __init__.py files to all directories
Merge branch 'alex_dev'
Merge branch 'master' into eb_dev
eos definition

started eos class.