Merge pull request #2 from philplckthun/dev_phil

Tidied up code;
Merge pull request #3 from philplckthun/dev_rafi

Merge pull request #2 from philplckthun/dev_phil