Merge pull request #1 from dasBKB/master

fdg
Merge pull request #2 from dasBKB/master

dsfgdsaf
Merge pull request #1 from MerkleB/master

asdf