3.3.1

Pulled from master and made production ready.