merging/fixing pull req 359