minor waypoints improvements
changed Display to use a Map instead of an Array
Merge remote-tracking branch 'upstream/master' into minors
Merge pull request #24 from fponticelli/minors

Minors