added fadein
Merge branch 'master' of https://github.com/keegantc/ocst