MarneusCalgarXP - 2009-10-08

a first version is pending. a few tests are still required