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

Updated according 4-18 nightly