merging pull req 360