#240
Merge pull request #319 from rhsu/240

#240