Bug fixing and Issue solving

#5 #6