brianc Merge pull request #72 from he-la/master