Merge pull request #1 from fsmk/master

merging changes