A few updates
Merge pull request #1 from liampmccabe/master

A few updates