Apollo

Merged lates changes from apollo branch - mainly cosmetics and readme