included pull requests 386 and 390 from binarylogic/authlogic

j