* Updates to checkin
Merge pull request #277 from iseppi/checkin-updates

 * Updates to checkin
Merge pull request #88 from zookeepr/master

Merge upstream to lca2013