Merge with scottjehl-master