Fixed assembly
Added parameters
Merge branch 'master' of github.com:bcdev/sst-cci-toolbox