Gh60 node limits merge with master

#60