merging pull req 502