Fixed some bugs. Version 0.1