Latest commit 73a6796 Feb 3, 2017 @thomassross Refactor