Merge pull request #338 from ddobrev/master

Exposed the architecture of native libraries
The simplest and least intrusive way to fix this.
Merge pull request #340 from golddranks/template-fix

The simplest and least intrusive way to fix this.
Improved the advanced property pass to avoid a crash and generate more properties.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>