Merge pull request #1 from fluxusfrequency/master

merging changes