Update
Merge pull request #5 from BurnBlader/master

Merge Oisin's changes into the master repo