Merge pull request #1 from u8sand/master