Adam

First merge of Adam and master branches.