Upgraded cecil after merge with @jbevain master