Merge pull request #189 from yuri-vashchenko/los-romka

#143 Options added and Integration
Merge branch 'master' into AndreyMaznyak