Merge pull request #2 from stevenknown/master

merge from main branch
fix automake scripts doesn't work on some linux system.
Merge pull request #3 from onecoolx/master

merge trunk code