new merge
Merge pull request #14 from tsq/master

new merge