Merge pull request #1 from nroehner/master

Fixes to Option2 Classes and others
Merge remote-tracking branch 'upstream/master'
revision and reorganization of classes plus examples to reflect SEED paper