2/5ah part 1
Merge pull request #821 from abhinavc/master

2/5ah part 1