Merge pull request #265 from trett/master

[vreen] updated