Finish framework
Finish extractor
Merge pull request #1 from CodeMySky/develop

Merge develop to master