Merge branch 'reubano-master'
Merge pull request #28 from reubano/master

Functional refactoring