Closes marchaos/master#2
Closes marchaos/master#4
removed a temporary file
Merge pull request #3 from ceremcem/master

Closes marchaos/master#2