minimal changes
Merge pull request #47 from tifs/master

minimal changes