#499
Merge pull request #657 from edgarz/master

#499