merged with origin
merged with origin
Merge remote-tracking branch 'upstream/master'
Added settings.cfg and pynma lib
lib folder
lib folder