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

Updated according 4-18 nightly