version 0.0.8 #SGoo-13 Fixed