Final version
Bug fixes