Fix issue #304
Merge pull request #529 from Potpourri/master

Fix issue #304 in piston