Fixed #20 : Context passing through