Resolved #20, #59
Merge pull request #69 from agentlame/master

Resolved #20, #59