Merge pull request #583 from gsn/master

Merge pull request #578 from gsn/test