more changes
Merge pull request #79 from Ricky1833/master

more changes