sumit

Results 2 comments of sumit

Sorry for the delay, but looks good to me, resolve conflicts and I'll merge and upload.

:shipit: