Merged in #162 from master