Closes #159
Merge branch '2.0'