Issue #27 and #28 on github

Summary:
https://github.com/Locu/kronos/issues/27
https://github.com/Locu/kronos/issues/28

Reviewers: marcua

Reviewed By: marcua

Differential Revision: http://phabricator.locu.com/D3882