upgrading to new dev version
Various fixes to add samples for supporting 2 architectures