ported bug fixes is 0.1 branch and added support for Path