V2.0

Closes #228, #218 and #190