still need to proof read
Merge pull request #3 from xxdesmus/furtherchanges

still need to proof read