black strip
Merge branch 'develop' of https://github.com/orobix/orobix.github.com into develop