Merge pull request #109 from erik-landvall/patch-1