#150 added multipart resolver
merge