Merge pull request #65 from BlockServerProject/master

Updating.