initial commit
Merge http://github.com/jfoeller/joce