Merge pull request #2 from novacoin-project/master

Merge from original
Merge pull request #3 from novacoin-project/master

Sync with novacoin master repository
Fix make problem OS X
Merge pull request #61 from gades/master

Fix errors of make on OS X