Updated with Mathematica notebook + author change