done issue #134
done issue #138
Merge branch 'fork/master'