Merge pull request #2 from vmotsak/master

update to origin
added password info to readme and removed flush
changes to merge upstream
after merge
Merge branch 'amaranthrose-master'
doc fixup