Fixed environment issue.
Merge pull request #40 from Reservit/omar

Fixed environment issue.