Finishing first beta version