Merge pull request #245 from alxdarksage/refactor-to-test-study

Refactor to test study
fixing build