update ap:master with latest work from idekerlab:master