Merge pull request #6 from nibsirahsieu/master

Allowing propel 1.x series