Merge #195 and #198