Revert "sw to 3.1" because of incomplete deps

This reverts commit a426ec1600f60ea0cee40cebecb3221ddc09533d.
Merge pull request #406 from xdel/develop

Revert "sw to 3.1" because of incomplete deps