Merge pull request #15 from suisea/master

merge changes
Merge pull request #4 from codeforseattle/master

Merge pull request #15 from suisea/master