Updated frontpage and description
merged