Initial stuff
Merge pull request #1 from mlavina/Initial

Initial stuff