merging with mike
Merge branch 'filtertag' of github.com:appiphony/Phillips into filtertag