Merge pull request #2 from novacoin-project/master