some progress
Merge pull request #1 from aruscher/andreas

some progress