Merge pull request #17 from nahakiole/master

Fixed a typo.
Merge pull request #18 from nahakiole/dev/nahakiole

Merge pull request #17 from nahakiole/master