Use Swirl 0.1.3 + Move utils functions to utils module
Merge branch 'dev'