Merge pull request #15 from brabbins/master

Requesting repull
Merge pull request #2 from ubc/master

Merge pull request #15 from brabbins/master