final commit version 0.06