Merging pull#192