Zbitnev commit to master #2