Merge pull request #2 from hcoderonly/master

Habib's huge contribution that saved our lives
mylastSmile