Merge pull request #1 from bwvoss/master

Merge pull request #1 from alexcodreanu86/refactor
Merge pull request #2 from alexcodreanu86/refactor

Merge pull request #1 from bwvoss/master