#469: Fix for multi-target compilation
Merge pull request #471 from dbabokin/multi_targets

#469: Fix for multi-target compilation