Merge pull request #3 from novacoin-project/master