Beta 2 - please help out testing etc - see the README