Merge pull request #116 from sonofliberty/patch-1