Fixed bugs and improved features
New version