Fixes #8

Commit message fail. Want to close that darn issue per commit...