Final touches to first version 4
Final touches to first version 5