Made changes that I forgot about... sorry guys
Merge branch 'master' of https://github.com/UCR-IEEE/IEEEUCR-MM-2014