Merge pull request #25 from Heather/master

simple pwd implementation