jhhoward Merge pull request #19 from alex16397/master