Merge remote-tracking branch 'upstream/develop' into develop
fixed issue#32 inc compile deps
Merge pull request #33 from teotigraphix/develop

Develop