Closes #135 and #107
bumped version to 0.4.1