changes
Merge pull request #300 from HoltMaki/master

changes