Merged with latest codebender.cc, the bug with registration fixed