Initial commit
Merge remote-tracking branch 'gammafp/master'