Initial add
Author: Stephan Samuel <ssamuel@yahoo.com>
Merge remote branch 'upstream/master'