first commit
Merge http://github.com/arcanumjp/flamel