Merge pull request #576 from adminempire/master

Fixing build. This fixes and closes Issue #433. Tested on both ARM arche...