Merge pull request #3 from attrition/master

BugFix: displacements using incorrect module
Merge pull request #2 from ricardojmendez/master

Update master branch from upstream