Merge pull request #2 from greese/2013.04

2013.04
Fixed admin password parsing bug.
Merge pull request #16 from erik-johnson/2013.04

2013.04