added constants [issue1]
la-la
fixed smth
Merge branch 'issue1'