Merge pull request #19 from charlesboes/master

MAJ