Merge pull request #1 from helmuthdu/master

merge 11-11-14