hot fix to make the master branch work. NOT A PERMAMENT FIX
conflict resolution
Merge pull request #15 from sapresearch/alexis-dev

hot fix to make the master branch work. NOT A PERMAMENT FIX