25/04/14 all updated
Merge pull request #47 from atc007/patch-4

25/04/14 all updated