(partial ad3 bugfixing)
Merge branch 'dev' of http://github.com/wolfe-pack/wolfe into dev