Merge pull request #15 from ryoe/master

Amanda's PR with merge conflicts resolved