Bug fixes in Makefile.
Merge pull request #24 from izhbannikov/dev

Bug fixes in Makefile.