Updated device build
Merge pull request #22 from ltfschoen/mapsV2toV3

Updated device build