0.1.3.3: Add map support, fixed ARGV detection