fixed bug w/ lights & station
Merge origin/master