Fixed #80
Merge branch 'master' into actions