Final commit version 0.1