caius Unify edge cases in the implementation

Latest commit 745ff51

Sep 5, 2016