More changes
Merge pull request #5 from mikeadeleke/master

More changes