More changes
Merge pull request #808 from nagheid/master

More changes - Getting more PUMPED