Merge develop branch

Testing: Instance  accepts parameters via settings
Minor fixes
Added tests