Final comit v 0.9