Fixed cal. It now works.
Merge pull request #7 from jgardella/master

jgardella-jbassi cal is now in working order.