weird bugs with commitin'
Merge branch 'a_fedorov'
quick fix
must fix bug #105
uncommitted changes