Changes for 0.0-2

