riptano/ComboAMI — pull request #56 by simonso (2014-08-11 06:12:57+00:00)
Title: Simon dev 2.5

Hi Joaquin,

Sorry for taking this long. I cherry picked everything based on your feedback to be in this one branch.

Thanks for your feedback!

Sincerely
Simon