Working on first stable version