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

Updated according 4-18 nightly