Klockwork

Fix issues #24 & #25