testing update
Merge pull request #2 from rmflueckiger/master

testing update