Merge asdf and master