Merge pull request #23 from ADmad/2.0-admad

2.0 admad