changes made
Merge pull request #7 from jayarbautista/1.14.0/REDMINE/467

REDMINE # 467