Merge remote-tracking branch 'origin/master' into rpeterman
Merge pull request #20 from ndynan-gp/rpeterman

Merge remote-tracking branch 'origin/master' into rpeterman