Updated according 4-19 nightly
Merge pull request #6 from gaich/patch-6

Updated according 4-19 nightly