changed couple of things
Merge branch 'master' of github.com:akademius/paper-ipdps-2014