Merge pull request #107 from aadehan/1.5.3-maintenance