Minor bugs fixes.
Minor changes in Makefile
Merge pull request #28 from izhbannikov/dev

Changes in Makefile