Merge pull request #10 from c0smo/master

pull req