JakeConway Merge pull request #24 from iansealy/master