Merge pull request #1 from fma2/version-1

Version 1