Fixed minor issue, added feature