- fix for issue #13
- some pep8 lintian work