Zbitnev commit to master #1