Version 0.0.4 and finalizes comments