Fixing issues #47 (forgot file) and #155.