Merge pull request #1 from iwno/master 

merge