Merge pull request #12 from fxspec06/master

Merge pull request #11 from fxspec06/fxspec06_