Thanks @jferris. Made the suggested changes in this #292.