Should resolve issue #13

Thanks @cheeseplus for the report for #13