Merge pull request #1 from darkwallet/develop

Sync