Merge pull request #1 from freicoin/master

bring up to date with main freicoin chain