Merge pull request #11 from evan10s/master