Updating for new ADT
Merge pull request #3 from greggiacovelli/master

Update with New ADT