Issue 19
Apply 1e703e289605d92ad7b3bcf9750c468d63a6a2d2 to allow configuration