davidglevy Merge pull request #5 from chrisphe/master