Minor installation bugs fixes.
Merge pull request #49 from izhbannikov/dev

Minor installation bugs fixes.