Add passwordmaker
merge