Merge pull request #124 from f4rkh4d/add-drift