Revision1

This should do 

I have also included your previous comments (my bad, I never check the branches of other people unless I have a pull request...)

t