Finalized version 0.5