Merge pull request #3 from stevenknown/master

merge trunk code