more changes
Merge pull request #19 from fusion94/master

more changes