Merge pull request #476 from vanfanel/master