merging pull req 495