Merge pull request #5 from apperclass/dev

fix wrong expectation
adds hybrid approach