davidferguson Merge pull request #12 from andrewferguson/master