API refactoring and check-in comment support (relates to #8)