Merge pull request #1 from alexcodreanu86/refactor

Refactor
Merge pull request #1 from bwvoss/master

Merge pull request #1 from alexcodreanu86/refactor