0.9.95b plus patches

2 patches added on 0.9.95b