Merge pull request #11 from fxspec06/fxspec06_

Merge pull request #10 from fxspec06/master