work on issue #248
general pretting up
issue #248
Merge branch 'issue#248'