Merge pull request #6 from wklaebe/for-upstream

merge, cleanup, resubmit