Merge pull request #14 from Orangecoins/master

Update Dev
Merge pull request #15 from Orangecoins/dev

Merge pull request #14 from Orangecoins/master