Merge pull request #2 from lhoman/master

20140422.0134 #merge# H04S3128:master