First fix. Version 0.0.1