Added support for  #9 and #3