Merge pull request #5 from 60frames/master

merging