Issue 90

previous merge was from master, not the proper branch.