Closed issue #17 and issue #14 (from google code)