Refactoring
Merge branch 'master' of github.com:monifu/monifu