Merge pull request #13 from monero-project/master

Pull monero-project changes
Merge remote-tracking branch 'origin/master' into integ