Updates
Merge branch 'master' of https://github.com/armandduijn/OASE
Working version
Temp
Test
Merge branch 'master' of https://github.com/armandduijn/OASE