** Merged changes from chrisblech's pull #235 **