Issues Solved #14 #40

for beta done