more changes
Merge pull request #112 from HoltMaki/master

more changes