Fixed (#66)
Merge branch 'master' into tl-master
Further work on (#8)