Pull for issue #306

Should merge now.