re #26, fixes #26 - making additional changes for 0.3-aplha3.