Changes for version 0.9.5