few adjustments
Merge pull request #43 from RoadstR/thomas

few adjustments