Merge pull request #169 from chrispbradley/master

Bug fix - forgot to change subroutine names