v0.4.0: issue95 & issue96