Fixed some bugs and prepared new release