gustafn
committed
on 30 Dec 15
- improve backwards compatibility