Merge pull request #20 from charlesboes/vocaabulary

Merge pull request #19 from charlesboes/master
Merge pull request #21 from charlesboes/master

Merge pull request #20 from charlesboes/vocaabulary