Develop

My working contribution for 0.12.1

Testing and working on Centos 6.3 and Fedora 17/18