Commit 6f8cc7bb6a77e7b03751051be86a0c6b36bdd86f

Edward Thomson 2013-08-05T20:06:09

Fix warning, fix memory leak