Makefile and main.cpp
Merge pull request #1 from desrik/development

Makefile and main.cpp