Merging patch of #28 and #37