Merge pull request #15 from suisea/master

merge changes