Merge pull request #72 from alex-deaconu/master

[chore] Split out disclaimer code