Merge pull request #2 from Yepoleb/master

Move header code to cpp
Merge pull request #3 from Yepoleb/master

Major update