Updated according 4-23 nightly
Merge pull request #20 from gaich/patch-5

Updated according 4-23 nightly