Final 2
Final with bug fixes
commit after upgrades 16102013