Merge pull request #3 from gnclmorais/master

Optional alternative container
Merge remote-tracking branch 'upstream/master'