Merge pull request #2 from antoneri/master

Complete refactoring