Basic Refactoring!
Basic Refactoring!
Merge pull request #1 from pnicorelli/dev

Dev merged!