Merge pull request #5 from lostin8/master

Master