add the latest 0.0.5-SNAPSHOT incorporating solution to issues #51, #52