Merging PR #56 .