Fixed some bugs
Version 2.1.1