Merge pull request #252 from ADTC/master