First version 0.9 commit