Merge pull request #1 from harlo/master

Please review latest upgrades
Merge pull request #6 from guardianproject/master

Merge pull request #1 from harlo/master