Merge pull request #8 from c0smo/master

pull req