direction now part of constructor
Merge remote-tracking branch 'origin/master'