Merge pull request #1 from monero-project/master

Attempting an online merge in my own repo