slightly modified
Merge pull request #52 from mdahm/master

slightly modified