merging pull req 507