Bugs fixed. Version 1.1