Final version 0.9

Ready for testing on server