Merge pull request #1 from jdhenke/master

small adjustments to make things work