Merge pull request #42 from HoltMaki/master

pull tags