Merge pull request #17 from cbs68/master

upd 25_11_2014