Merge pull request #1 from H04S3128/master

20140422.0134 #merge# H04S3128:master
Merge pull request #1 from lhoman/master

Merge pull request #2 from H04S3128/master