ref Pushkar Gupte https://github.com/pushkar85 (together for 0.4)