Merge pull request #54 from zznic/master