First master commit to work with fedora 18,19,20 and ubuntu 12.04 and 13.10