Update 2014 10 24
Merge pull request #17 from TehporP/master

Update 2014 10 24