fixes
merge
fixed scoping
small changes
merge
Merge branch 'master' of github.com:dashuaige92/owl