AdwinTrave/A3M — pull request #5 by AdwinTrave (2013-11-19 19:50:41+00:00)
Title: Ci3

Merging the current CI3 branch into master for future merge into the main branch.