Version 1.0

Bugs fixed