Merge pull request #2 from WhisperSystems/master

second pull request