changes
Merge branch 'pldi-2015' of github.com:davdar/maam into pldi-2015
merge