updated
Merge pull request #353 from ffrensch/master

updated