Merge pull request #6 from satzcoal/master

merge1027