Merge pull request #5 from brandav/dev

Unit upgrade and bug fixes test
Merge pull request #6 from brandav/dev

Update assets
Merge remote-tracking branch 'upstream'