Merge pull request #1 from codersquid/master

merge with new interface