this closes #151
Merge pull request #152 from eprogramming/master

this closes #151
relative to #153
Merge pull request #154 from eprogramming/master

relative to #153
relative to #153
relative to #153
relative to #153
Merge pull request #157 from eprogramming/master

Others can contribut doing the same for remaining classes