Merge pull request #2 from H04S3128/master

20140422.0159 #merge# H04S3128:master