Merge branch '#140'