Merge pull request #14 from tmas/master

Create new file if it doesn't already exist
fixed confilct?
Merge pull request #16 from pawnPhilosopher/master

Unnecessary, just fixes weird git sync errors