changes now work with password and smoke field
hopefully this would cure the problems
Merge pull request #4 from wmb1232/master-alt

Master alt