Merge pull request #48 from whitj00/master

Fix assertion crash when using SPV clients
Merge pull request #6 from TacoCoin/master

Merge pull request #48 from whitj00/master