Reorganizing code
Solving conflicts
Using travis
Adding year
Merge pull request #5 from chdemko/master

Reorganizing code for building