changes based on ampcamp feedback
Merge pull request #108 from atalwalkar/ampcamp3

changes based on ampcamp feedback
Merge branch 'ampcamp3'