Still fixin' that build
Merge pull request #249 from alxdarksage/refactor-to-test-study

Still fixin' that build