Merge pull request #135 from Gautham/Dev

Fix incompatibility issue with PHP < 5.4