Merge pull request #31 from zillabyte/xiao/master

@nkarnik -- fix