final commit for version 0.04