Revert "Revert "Merge pull request #44 from yllekkram/mark-master""

For an explanation, see:
https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt

This reverts commit e942142382bd41e487b71b8a2e9d3fe3dca7f58e.