adding fixes
Merge branch 'develop' of https://github.com/cosmicdreams/OWC5 into develop