UPD_27_11_2014
Merge pull request #21 from cbs68/master

UPD_27_11_2014