merging pull req 458