remove whitespace
Add support for open tracking
merge open_tracking into master