merge
Merge pull request #1 from nastr/2013

merge