perliedman Merge pull request #49 from trobert2/master