v2.0

Issues: #51, #50, #49, #48, #47, #46, #45, #44