changes
Merge pull request #79 from HoltMaki/master

changes