V8.1

Resolved #158, #331, #336