Fixes/new features
Merge pull request #2 from benastan/smoother

Fixes/new features