Merge "Fixes bug #57"