cleanup code, warnings gone
Merge pull request #3 from bartwo/master

cleanup code, errors gone