Fixed #71 #70
Merge pull request #74 from agentlame/master

Fixed #71 #70