Merge pull request #2 from philplckthun/dev_phil

Tidied up code;